Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaces the ARC interior & ARC tweaks #6383

Merged
merged 5 commits into from
Jun 14, 2024
Merged

Replaces the ARC interior & ARC tweaks #6383

merged 5 commits into from
Jun 14, 2024

Conversation

Zonespace27
Copy link
Contributor

@Zonespace27 Zonespace27 commented Jun 6, 2024 •
edited
Loading

About the pull request

  • Replaces the ARC interior with a better-looking one, sprite made by Zydras
  • Modifies the ARC model to only have one door.
  • ARC now fits 5 instead of 7 (including reserved slots)
  • ARC now fits 4 xenoes intead of 5
  • Fixed vehicle elevator causing vehicle sprites to be incorrectly offset/directional
  • RE700 armor pen 10->15

Explain why it's good for the game

  • It looks cooler and makes the ARC feel less like a TARDIS
  • Necessary for the new ARC model, plus Lore Accuracy(tm)
  • It wasn't meant to fit 7 in the first place
  • There's a total of 5 walkable tiles in the ARC and xenomorphs are a fair bit larger than humans, so I considered this fair
  • Longstanding bug fixed. Fixes ARC sprite comes out badly rotated out of the elevator #6362
  • The gun's working as an okay deterrent against t1s and other unarmored xenoes, but it isn't enough of a deterrent to the more heavily-armored ones.

Testing Photographs and Procedure

image

Changelog

🆑 Zonespace, Zydras
fix: Vehicle elevator no longer incorrectly rotates vehicles
add: New ARC exterior and interior
balance: ARC now fits 5 humans instead of 7
balance: ARC now fits 4 xenos intead of 5
balance: ARC's RE700 turret armor pen 10->15
balance: On account of the smaller size, the ARC no longer has a nanomed.
/:cl:

@Zonespace27 Zonespace27 requested a review from Nanu308 as a code owner June 6, 2024 00:38
@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Fix Fix one bug, make ten more Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Jun 6, 2024
@Zonespace27 Zonespace27 added Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? and removed Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? labels Jun 6, 2024
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
031546e
@Drulikar Drulikar added Testmerge Candidate we'll test this while you're asleep and the server has 10 players Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. labels Jun 6, 2024
Drulikar
Drulikar requested changes Jun 6, 2024
View reviewed changes
Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise looks good and appears to be working.

code/modules/vehicles/arc/arc.dm Show resolved Hide resolved
maps/interiors/arc.dmm Show resolved Hide resolved
@Zonespace27 Zonespace27 requested a review from Drulikar June 6, 2024 02:50
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
e786cd0
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
7172f98
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
d898fa7
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
1499df2
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
f27ebd5
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
81a8ebf
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
ca90cba
cm13-github added a commit that referenced this pull request Jun 6, 2024
@cm13-github
TGS Test Merge (#6383)
040a172
This was referenced Jun 11, 2024
Open
Closed
Closed
cm13-github added a commit that referenced this pull request Jun 11, 2024
@cm13-github
TGS Test Merge (#6383)
a1e663f
cm13-github added a commit that referenced this pull request Jun 11, 2024
@cm13-github
TGS Test Merge (#6383)
a83e780
cm13-github added a commit that referenced this pull request Jun 11, 2024
@cm13-github
TGS Test Merge (#6383)
7e4e4d6
This was referenced Jun 11, 2024
Open
Closed
cm13-github added a commit that referenced this pull request Jun 11, 2024
@cm13-github
TGS Test Merge (#6383)
d0d204c
cm13-github added a commit that referenced this pull request Jun 12, 2024
@cm13-github
TGS Test Merge (#6383)
91a870c
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jun 12, 2024
Closed
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jun 12, 2024
Closed
cm13-github added a commit that referenced this pull request Jun 12, 2024
@cm13-github
TGS Test Merge (#6383)
8652bdd
This was referenced Jun 12, 2024
Closed
Closed
Closed
@GrrrKitten GrrrKitten mentioned this pull request Jun 12, 2024
Closed
3 tasks
cm13-github added a commit that referenced this pull request Jun 13, 2024
@cm13-github
TGS Test Merge (#6383)
8266fa2
cm13-github added a commit that referenced this pull request Jun 13, 2024
@cm13-github
TGS Test Merge (#6383)
a8e5496
@cm13-issue-bot cm13-issue-bot mentioned this pull request Jun 14, 2024
Open
nauticall
nauticall approved these changes Jun 14, 2024
View reviewed changes
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprites 👍

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Jun 14, 2024
cm13-github added a commit that referenced this pull request Jun 14, 2024
@cm13-github
TGS Test Merge (#6383)
0c1c103
@Drulikar Drulikar added the Mapping Approved adds 500 new dict keys label Jun 14, 2024
@Drulikar Drulikar added this pull request to the merge queue Jun 14, 2024
Merged via the queue into cmss13-devs:master with commit 89c4b3b Jun 14, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Jun 14, 2024
@cm13-github
Automatic changelog for PR #6383 [ci skip]
ff4c5b1
@ciitrusbeetle ciitrusbeetle mentioned this pull request Jun 14, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nauticall nauticall nauticall approved these changes

@Drulikar Drulikar Drulikar approved these changes

@Nanu308 Nanu308 Awaiting requested review from Nanu308 Nanu308 is a code owner

Assignees
No one assigned
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ARC sprite comes out badly rotated out of the elevator
4 participants
@Zonespace27 @nauticall @Drulikar @johndoe2013